From 00eca9c7d1e4eb00cfa41761a3a92683a9f94fc5 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Fri, 17 Nov 2006 10:05:12 +0000 Subject: [PATCH] [OPROFILE] Add support for core and core2 chips. Tested on Woodcrest processors. Requires Oprofile 0.9.2. Signed-off-by: Andrew Theurer --- xen/arch/x86/oprofile/nmi_int.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/oprofile/nmi_int.c b/xen/arch/x86/oprofile/nmi_int.c index b51f17993d..32787f180c 100644 --- a/xen/arch/x86/oprofile/nmi_int.c +++ b/xen/arch/x86/oprofile/nmi_int.c @@ -305,22 +305,24 @@ static int __init ppro_init(char *cpu_type) { __u8 cpu_model = current_cpu_data.x86_model; - if (cpu_model > 0xd) { + if (cpu_model > 15) { printk("xenoprof: Initialization failed. " "Intel processor model %d for P6 class family is not " "supported\n", cpu_model); return 0; } - - if (cpu_model == 9) { + else if (cpu_model == 15) + strncpy (cpu_type, "i386/core_2", XENOPROF_CPU_TYPE_SIZE - 1); + else if (cpu_model == 14) + strncpy (cpu_type, "i386/core", XENOPROF_CPU_TYPE_SIZE - 1); + else if (cpu_model == 9) strncpy (cpu_type, "i386/p6_mobile", XENOPROF_CPU_TYPE_SIZE - 1); - } else if (cpu_model > 5) { + else if (cpu_model > 5) strncpy (cpu_type, "i386/piii", XENOPROF_CPU_TYPE_SIZE - 1); - } else if (cpu_model > 2) { + else if (cpu_model > 2) strncpy (cpu_type, "i386/pii", XENOPROF_CPU_TYPE_SIZE - 1); - } else { + else strncpy (cpu_type, "i386/ppro", XENOPROF_CPU_TYPE_SIZE - 1); - } model = &op_ppro_spec; return 1; -- 2.30.2